Skip to content

Interim conflicts#236

Merged
rozyczko merged 2 commits intointerim_updatesfrom
interim_conflicts
Apr 24, 2026
Merged

Interim conflicts#236
rozyczko merged 2 commits intointerim_updatesfrom
interim_conflicts

Conversation

@rozyczko
Copy link
Copy Markdown
Member

remove conflicts between interim_updates and develop caused by earlier merge of consistent_minimizers

@rozyczko rozyczko added [scope] maintenance Code/tooling cleanup, no feature or bugfix (major.minor.PATCH) [priority] highest Urgent. Needs attention ASAP labels Apr 24, 2026
@codecov
Copy link
Copy Markdown

codecov Bot commented Apr 24, 2026

Codecov Report

❌ Patch coverage is 97.22222% with 1 line in your changes missing coverage. Please review.
⚠️ Please upload report for BASE (interim_updates@78d4ddc). Learn more about missing BASE report.

Files with missing lines Patch % Lines
.../easyscience/fitting/minimizers/minimizer_bumps.py 97.05% 1 Missing ⚠️
Additional details and impacted files

Impacted file tree graph

@@                Coverage Diff                 @@
##             interim_updates     #236   +/-   ##
==================================================
  Coverage                   ?   86.54%           
==================================================
  Files                      ?       52           
  Lines                      ?     4660           
  Branches                   ?        0           
==================================================
  Hits                       ?     4033           
  Misses                     ?      627           
  Partials                   ?        0           
Flag Coverage Δ
integration 45.27% <97.22%> (?)
unittests 85.23% <97.22%> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines Coverage Δ
...rc/easyscience/fitting/minimizers/minimizer_dfo.py 97.96% <100.00%> (ø)
.../easyscience/fitting/minimizers/minimizer_bumps.py 97.52% <97.05%> (ø)

@rozyczko rozyczko marked this pull request as ready for review April 24, 2026 11:37
@rozyczko rozyczko merged commit 7e173c7 into interim_updates Apr 24, 2026
31 checks passed
@rozyczko rozyczko deleted the interim_conflicts branch April 24, 2026 12:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

[priority] highest Urgent. Needs attention ASAP [scope] maintenance Code/tooling cleanup, no feature or bugfix (major.minor.PATCH)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant